Fix moonwalking -- Part 1