minor fix
commit merge after resolve