Ensure the issue #21 is fixed

Close #21