queue fix
merge