Corrigindo bugs reportados no ticket #72620