Added Stephan patch