Issue #110 - fixing bug