Ajustes, conforme a issue #4