Issue #193 Fixed bugs