Bugfix: closure fix