more elegant way of fixing the import issue