Issue #121 - Fix bug