Bug fix: Remove free variable