Remove race condition at callback mapping