Another fix for #228