Resolves bug-reports: https://bugs.openfoam.org/view.php?id=3936 https://bugs.openfoam.org/view.php?id=3935