Handle diff edge case