address review comment about callback firing