I would remove this check