Solving Issue #34

I think the best solution.