Should be fixed, test it out