- Fixed #332