Added HTML check too