Add a fix from Stephan Wehner.