Fixed it!
Well, it's kind of hacky, so we need to do a little work here and there