better "+" handling