Fixed bug #74 again :-)

Leo build: 20141119155916