small fix
merge fix