Rev 22 fixed callback