The close fix is imperfect as it's working around a timing issue, but
it's better than nothing. I'd be quite happy to fix this a better way,
but don't know what that is yet.