Notification avatar of user shows system, not replied user

This issue still persists on 3.5.1, anyone has a workaround for this?

A more graceful alternative would be to show 2-3 avatars overlapping of the actual users of the most recent replies.