Fixed packaging woes