Another fix to 4552cf2