Fix for bug #233