Fix bug with handling nested maps