Minor refactoring (Issue #411)
Fix for an Issue #410