fixed dict handling