fix weird issues