manual + bugfix