Fixing queue duration issue