Removed special case