Issue #49: Solved