Further work on air hook bug. Finally done.