PCT-154: bugfix