fix for queue