Try to fix queue migration issue - is this a hz bug?