Get rid of awful spacer hack