Changes from Ioan review
Small fix