another refactor bugfix