fixed type issues