Work on the issue #43

Issue #43 is not fixed yet. Need more iterations.