fix for latest updates