I didn't quite fix #1424 completely - hopefully this gets it right