- Fixed issue #303