Fix bug where an extra '!' is displayed