Fixing issue with edge gen