Fixed Issue #57