Issue #3285014 by kristiaanvandeneynde: Make sure only the requested scope can be returned by a calculator