Bug fix: Has more