Making updateOn Enter work as expected