Refactor the code for the issue #65.