I installed the attached further patch, which should fix this in a 
better way.