Works with snapshots too
Name is everything but space
Fix bug for Mc <= 1.5