UBSBUD-1957 - implemented