Fixed packaging conflict