Fixed problems with incompatible iesi.collections