Issue #177 - Fix bug