Tying to fix P3 incompatibility