Elimination of shorts