Minor change for Untag to be more semantically reflecting