I guess then we should keep the original and I'll remove the instanceof check.... sounds right?