version 2.4. fix registration race condition.