Closes https://github.com/balderdashy/waterline/issues/46