Fix for #1143