Shouldn't have to do this...