Prevent issues with the updated