#820 - Fixed

Signed-off-by: Carlos Escribano Rey <carlos@markhaus.com>