Issue #1257