Additional bugfix.