Fix refactor miss #11