Fix variables creation order.