simplified the fix, not conditional on typesetted anymore