fixes in import function