Short tag fix