some fixed
some fixed