Update from 2.2.0 to 3.0.1 break everything

That’s a great find. I wonder whether this was the root cause of the problems in here as well.