Improve vanish hook