- Fixed issue #628 and issue #629