Patch by Christoph v.W.: