Fix for #1099