Does this need to be addressed before merging?