MAP-964: improve up propagation