Fix for #468