Fixed the bug
Merge branch 'BugFix_46'