refactor plus bugfix