Added force flag to skip type check against avatar