minor fix
merge fix