Fixed issue #303