Issue #428 - fixing bugs