fix craZiness