Fix for #511