Fixed stuff for gooooood