partial bugfix