Issue #187 - fixing code