Minor fix
Bugzilla - bug #4629
Code cleanup