Issue #159 - bug fix