fixed None case