Added back Alex's fix for rare condition