Fix for #1274