Your fix looks good to me.