Issue #188 - fixing bug
Issue #188 - fixing bugs