applied patch
add test coverage