Note that this version still has a problem

(Issue #1)