Fix takes when changing to individual

Fixes #2967.