Fix for bug #32