Fix for 1274

I believe this will fix issue #1274