#180 #188 resolvidos