- Fixed #345