auto-fill mode works correctly now