wrong refactor fix