CDB-3186 wrong if
Merge pull request #525 from CartoDB/CDB-3186

CDB-3186