fixed possible infinite loop when fallback was set to default-executor plus cosmetics