Attempt at fixing auto-updating