#JC-1381 - small refactoring