Go back on the code (issue #84).