--HR-272 added helper function