Fix bugs in individual