- Fixed #340