Fix for setting up packages correctly
.