fixed collection issues