Fix import that crashed the system under certain conditions