More fit checks

Is this intended?