Fix for bug #111