Fixed Issue #303