Merge branch 'hotfix/bug_fix'
Fixed a bug preventing choosing previous result
Merge branch 'hotfix/bug_fix' into develop