Try fixing import loops