- Fixed issue #331