fix creatful and crealoc
manual merge