fix for DARS-186