Fix for #486