Implementing a solution for Issue #1.