Issue #35. Small code improvement.