Bugfix and penetration factor include