Fix for #930