Fixing bad refactor of console