Fixed bugs in creaet