Resolvendo Tkt499

Resolvendo #tkt499