Alteracoes bug fixing