Fix infinite loop in cylinder moves