Fix untagging

This is an alternative approach to #28.