Updated to work with M4 0.5.0+1.r21823