Split fix attempt v1