bugfix finished