Maybe fix counting issues?