add autoclose back in until it drives me nuts again
merge