Terms now handled properly