- Fixed issue #336