try to fix QMW-154 and QMW-189