Bug fix on +