some bugfix...