Another bugfix attempt