- Fixed issue #332