finally fixed fixes for update