Refactoring to fix Github Issue #3