This is the only change to fix #81