Hotfixes production take 2

Rebased sin los errores de fin-de-línea.
`end` at 7, 4 is not aligned with `if` at 3, 14