Fixed Auto update