Attempt at fixing PCL profile 7 (#521)