Issue #172: One more change for the batlab build