Address callback fix