Trying to fix the close queue