Fix cmpd import

Merged Todor Kondic requested to merge fix-cmpd-import into master

Merge request reports