- Fixed issue #335