Fix ambusher not closing correctly