better bugfix