fixing for latest updates