CL untagging fixed for #520

It'sa me!