fixed this stuff