minor fix
merge