Resolving Issue #44