Copy #resolves bb-1955