Slight issue after having migrated to v3.0.10 from v2.5