#1375 part1
fix callback
one more fix
more fixes
removed debug