Fix Bug 4240. Thanks to Karolin <ks@sernet.de> for bugging :-)