fixed multiple closure support