- Fixed #337