Pull request/e90405bf

Still trying to appease the PackageEvaluator