fixed even more stuffs in casting hell, final?? ... :'(