Just a little refactoring
Fix for an Issue #351