Fix for #489