Remove queue handle. Fix #520