fixed raw types