Yet another fix for bug #66.

Leo build: 20141113093140