Fixes #1275
Merge pull request #1276 from brycethomas/issue1275

Fixes #1275