Some bugfix left