Resolvendo bugs...