Fixing setup breaking bug