I think you need to return after this callback so that it is not called again below