* Fix bug from refactor