Fixing weird buggy shit