Fix for #6
Merge pull request #7 from rethinkdb/michel_6

Fix for #6