Fixing broken setup