Ra/fixed error

This PR fix things that broke @jlgasparrini  :baby_bottle: