Fix for collections; will address later