Fixing the stupid thing