Work to get isMoveValid working again