Fix for #478