- Fixed issue #329