Bugfix #12, avoid double +