- Fixed #336