temporary fix for tag check