Comment out auto closing for now