MD: adding workaround for GOME2 management