Additional bugfix