Resolving Issue #115