Change for #380 according to comments