Improving compatibility with ma