fixes for closure