More fixed for the update