Corrigindo bugs.