- Fixed #335