- Fixed #372