Fix for new dictionary API
Note recent changes