Fixes #168.
Merge pull request #169 from CartoDB/CDB-168

Fixes #168