Fix for KeyIterator/ValueIterator