Fixed for AdHoc
Merge pull request #1 from stucarney/master

Fix for AdHoc