[FIX] Bundle improvement