au: fixed for both cases