Added fix for closure