fixed None error