- Fixed #357