Resolving Issue #1586

This is a proposed resolution for https://github.com/balderdashy/sails/issues/1586