Fixing packages issue