- Fixed #346