#138 #137 resolvidos