Fixes #1440
Merge pull request #1442 from jodav/fixPrisoner

Fixes #1440