Temporary workaround to allow Close to work