Update to prevent multiple callbacks