more bugfix attempts