Potential bugfix for #1282
Merge pull request #1283 from jfim/patch-1

Potential bugfix for #1282