fixed stuff with unsafe field