temp fix - merge comlib