Add some checks to hopefully help with sparse cases.
More experiments