Fix for issue #1274