More edge cases covered.