Fix for #1268