Fix for selecting old avatar from history