Close Bugfix