fix untraced images
Merge branch 'master' into chats