Fix too much stripping...