Sentinel support

Was #452.
Good catch.