Cleanup Ctrl+D fix