bug fix
Merge branch 'qa/bugfix'