Fixed checking for short-tags