Based on xeffyrs suggestion. Already available in repo so this is just to check if it fixes the build.