Few more places to handle bad splits