refactor fix