Bug fix: Does it work or still not v2