Fixing stuff =(