Added even more parentheses
Fixed merge conflict