Ensure #20 is fixed

Close #20