Fix for #475