[FIX] bugs in craft