Bugfix: Handle cleanup on handle close