small fix
merge