Issue #264, fixing bugs