Trying to fix some shit