- Fixed #362