Bug Fix - version 1.2.2

Signed-off-by: PedroLourenco <pdrolourenco@gmail.com>