speed fix
merge