FIX: dictionary items incorrectly called