Close GH-96. Only add packages once