fix issue with v2 apps