Fixes the slowness on validation
Merge pull request #1388 from ahomatthew/projects/jnap

Projects/jnap
Merge