More bug fixing

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