some fixed
some fixed again