Callback fix