Fixed weird issues