this seems like an uber hack... We have to find a better solution