#94, #92, #91: fixed few careless mistakes