Last avatar fix maybe?