Seems to fix the Wichtelwald problem as well. I'll quote the original post in the corresponding thread.