Bug fixing on endpoint