manual bugfix