fix of bugs