Applied bugfix