dev+: work on callback thread-safety