Fixing setup problem