Fix group picture disappearing.

Rebase