Fix for long tag names