MA:gut generalized. See #509