bugfix, left over from refactor/cleanup