finally fixed (for now) the packaging issues