Fixed Bug 51
Merge branch 'Hotfix.51'