Fixed controller update order