Serve packages correctly Ref T6