Incorportates subsequent bugfix.