Fix issue 2630
Fix indentation
Merge branch 'ghost1227-issue/2630'