Fixed regression where always is calling the old interface queue instead of enqueue