fix take-off bug
merge