[Fixes]
- https://github.com/ivolunteerph/ui-studies/issues/4
- https://github.com/ivolunteerph/ui-studies/issues/3