Minor cosmetics
Fix for an Issue #588