Add the rest of the changes, it was missed from the previous commit ;(