FIX jpfuentes2#361
Group association conditions in parentheses
Fix jpfuentes2/391