Timer rearm logic fixed