Fixed: tag output broken