Fix callbacks conflict