U4-4931 - fixing & refactoring