Bugfix and echo text