v3.0 - Quick bugfix