Patched the console PR as requested by xanax`