2270

Fix for #2270 in 1.1.x