fix callback support