Bug fix for setup script