Fix code lost in merge