bdgmaso - suggestion #555