Issue 213 testeada en DEV