LPS-46216 It needs to be changed here too