CR: Another check in .mm