You're probably right, doing it immediately mimics the previous behavior better.