Fix issue #159 on develop

Signed-off-by: Pablo Lezaeta <prflr88@gmail.com>