fix for bug #19