Fixed crossout issue