More compact code (1)
Fix for CI instances.