Fixes #3

This implementation fixes #3 bug.