We have to get rid of this hack...