Fixing update order