Removed special case for HTML