Bugfix attempt