Merge pull request #357 from charles-dyfis-net/regression-fix-352

Fix regression from bbbb76d4