fix over written stuff