Fixing issue with newer powerline codes