Fix for new dictionary API
Fix for new dictionary API