- Fixed #368