Handle zero time diff better