Testing suggestions from Julien https://github.com/gosexy/db/commit/06c5d131d483fbd330cd94e68eb9d56d9f7bda95