Addressing the Invalid Move Bug