Fixed issue #2474 about Console improvements