Fix for LTV crashes observed with changes made for issue 824 (MR 541) See merge request !543
mentioned in issue #852 (closed)