refactor 12 issue