problematic imports fixed