text interference fix
merge