improved callback replacing
version 8.0.46