No longer crashes on close