Fix queue close and add comment for current limitation