Bringing this up now...before it becomes a problem