Revert "Revert "- Arreglos de bugs""

This reverts commit f0d0161afb95c38927f2a58d0185a443d1a84ca5.