Revert to instance_number check