1.1.5 callback bug workaround.