Better collection prevention handling