Tried to fix this stuff