fixed again bug