Final proper callback fix