Fixing stuff...damn