fix the stupid stuff