Fixed problems introduced when prefix was added to keys