From Stephan Huber, build fix