OAK-1730 test and fix for the issue