Revert "Fix: Issue #16"

This reverts commit e9b7e3fd311b2497f2f9d025a1838ee9bd9fab3e.