Fix build based on work by nadlabak
> Commit a632459c61d867a5b12a9724145d9ed169e374e3