fixed weird errors