Oops, the bug fixed by previous commit was #69, not 311.

Close #69