Finally fixed M7