Bugfix for WorkspaceCalculation