fix for doble 'if' operators

Time: 168 ms, Memory: 20.25Mb
OK (199 tests, 201 assertions)

Change-Id: If5491bad9094fe031b6217442d6e0caddf87a45c