Fixed multiple calls to callback bug