Fix of import issue #16