bdgmaso - suggestion #1020