Solving Issue #33