Another bugfix, working commit