Select all the required columns ...

[jasonvarga]

I opened up this repo locally to check something out, and I had this commit sitting here from ages ago but never pushed up. 😬

Will update this description once I work out if there was a original related issue it was fixing.

But, it also fixes #26 which has just been reported.