Fix do issue #1