Should fix the crash related to double registration