More on the previous commit.

Signed-off-by: Mauricio Jost <mauricio.jost@activeeon.com>