Hopefully the right direction, I want to take this change and update it in my forked version.