Fix crash & not updating after