Bug fix: too long