Fixes #297.
Merge pull request #306 from pencilblue/issue/PB297

Fixes #297.