Fix issue when register in normal way