Fixed rawValue bug