- Fixed #350