REFACTOR: Small bugfix