fixed weird issues I think