fix rawValue