Yet more bugfix