One more fix after upgrading