Fix for #1150