Tentative fix of packaging