Add a type check hack for dev/prod bug