[ET Trac] #963: Improve McLachlan accuracy