fix import registrant issues