- Fixed #364