- Fixed #339