Bug/claudia 4366

#### Reviewers
@jframos @flopezag

#### Description
FIX bug 

#### Test
tested locally