Fix extra callback bug