add some fixing