Fixed MAJOR clusterfuck