Change to async listener.