add guard cases to avoid callback uid issues