Fix #476
Merge pull request #477 from VertNet/feature/jot-fix-476

Fix #476