Fix for package builder