- Fixed #325