Fix for new dictionary API