fixing bugs ver 0.89.2 [5]