bug reported by Jerome seems fixed now for the specific topology (60) Nevertheless, changes required to completely fix it