Long time no see! Close #38.

Conduct more fundamental fix than the suggested solution.