Bugfix for recent contributed patch.