Fix for #253