Patch Contributed by Karl Meredith, FM Global. Resolves bug-report https://bugs.openfoam.org/view.php?id=2621