Fixed Issue #1302