fixed type problems