Hopefully fixes all update issues