Bug/claudia 4321

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