[RIC-306] - Fix bug with parsing