Trying to fix this stuff