some bugfix