REFACTOR: issue #32