Small optimization for a rare case by removing a hack
Moved label to a more appropriate location