quickfix for SubComannd, issue #4060