Further bugfixing :)

Signed-off-by: Bruno Alves <bruno.m.alves@gmail.com>