some code lost in a merge