fixed missing parenttheses
merged conflict