applied nsz's style.diff patch