Issue #428 - fixing bug