Some bugfix...