Adjusted for texlive 2014