NUM-115: Small bug fix