#DCS-26: fixed