Fix package preparation