Another update for an Issue #380 (--common-... switches)