bdgmaso - suggestion #1317