#193 e #192 resolvidos