fix 30c3 move bugs