fix deadlocks on importing - now really