Attempting to fix close bug