Horrible hack to fix #2, I'm sure there is a better way to do this but my brain hurts