- Fixed #347