Applied patch from bug #44535 contributed by Paolo Mottadelli <paolo.moz@gmail.com>, <p.mottadelli@sourcesense.com>.