bug fixed avatar + change code by message in push