fixed None values.