some fixing
some fixing