Try to fix echo-detection to work on all systems that provide any