Fix issue #1257