fixing the dupilicated callbacks