* some bugfix