There must be an easier way to get rid of this...