commit correction on cast and code error (forget to remove some)