Fixes #360. For real this time.
Merge pull request #364 from pencilblue/issue/PB360

Fixes #360. For real this time.