bug 827: Changes requested by Alexander Bahlo