fixed a too aggressive import optimisation