Accept FS#11722 by Michael Hohmuth