- Fixed #358