Fix for bug #104