Fix Task Queue