Hopefully fixed UI hang on import.