[#1] Fixing data according to newest informations.