fixed it for collections too