Trying to improve 'fix short durations'