Fix for queue 3