Fixes #361
Merge pull request #362 from pencilblue/story/PB361

Fixes #361