Bug fixing with Jordan