Patch from Sven-Ola Tuecke <sven-ola@gmx.de> from