added zero-stripping