fix on previous refactor