Bugfix: don't need this anymore