Don't count twice Closes #2384.