Be more conservative when closing things