Work on bug #73