Added code to handle pathological 0-0 case