Add code lost in merge