Use refill instead of auto-fill, see how that pans out.