Re-do the fix from the https://github.com/webedx-spark/Priam/commit/204776a681002d545be9e724fba9106e9b3be554