Some bugfix