Issue #831 fixed
Cosmetics