Fix propagation of nested maps