fix everything

I think this is a better fix.