More complete fix for laf:issue-87

Anyone care to review before I merge?  This works on my laptop and my home server, but they have limited client devices.