Reintroduce check, make it a little more robust.