Fix for #1119