Minor bugfix/refactor.