|#769 | Fixing to pass corresponding facility in iteration