Fixes TP #259 but does not fix the import issue