Reduced unnecessary echoes (thanks xoft)