Bug/claudia 4332

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