fix of stuff