Another attempt to fix last_update