Fixed replacement of the correct individuals