Implement better bugfix