Improving automatic tick handling