added: new fixes