Attempt to fix the build

Created the PR, so we can run CI, and see if goes :green_heart: