Attempted bug fix on import.