Modified to fix ISSUE #41