Solving Issue #8: https://github.com/sebastialonso/elsapo-app/issues/8