UQ-613: Fixed