Fix broken upgrade to v41