Fixed Issue #1224