Fixing the parsing when triggered later
Merge branch 'master' of https://github.com/NextCenturyCorporation/EVEREST