appears to fix the hang and doesn't close issue