Updated for edge case from TA...
Updated for edge case from TA...