Fix issue BPS-529