Quoting changed to simpler version