Fixed typesetting