Issue #187 - fixing bug