bdgmaso - suggestion #989