Oops, 1 more bugfix!