Fixed a bug
Merge branch 'ssov-hotfix'