fix issue 2926
add tests for issue 2926