WIP: ditch the check altogether