Fix for long tag