- Fixed #342