Issue 237

https://github.com/balderdashy/waterline/issues/237